Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21226] Improve CI workflows in 2.5.x, and branching model refactor (backport #365) #368

Merged
merged 1 commit into from
Jul 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 2, 2024

Description

This PR improves the CI workflows, making them as similar as possible to the Fast DDS workflows.
It also introduces a braching model refactor, similiar as the performed in Fast DDS repository.

Note: While backporting this PR, please ensure the following changes:

  • Remove nightly jobs
  • Update ubuntu-ci.yml file with the proper fallback branches
  • Change fastdds.repos to fastrtps.repos
  • 3.3.x and 3.2.x requires both 1.1.x and 2.x Fast CDR branches to be tested
  • 2.5.x requires only jdk11
  • 2.1.x requires building on ubuntu-20.04, and only jdk11

@Mergifyio backport 3.3.x 3.2.x 2.5.x 2.1.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #365 done by [Mergify](https://mergify.com).

Copy link
Author

mergify bot commented Jul 2, 2024

Cherry-pick of d912d11 has failed:

On branch mergify/bp/2.5.x/pr-365
Your branch is up to date with 'origin/2.5.x'.

You are currently cherry-picking commit d912d11.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .github/workflows/config/test.repos
	new file:   .github/workflows/nightly-ubuntu-ci.yml
	new file:   .github/workflows/reusable-ubuntu-ci.yml
	new file:   .github/workflows/ubuntu-ci.yml
	new file:   RELEASE_SUPPORT.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/actions/fetch-fastddsgen-repos/action.yml
	deleted by us:   .github/workflows/config/build.meta

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jul 2, 2024
@JesusPoderoso JesusPoderoso added this to the v2.5.3 milestone Jul 2, 2024
@JesusPoderoso JesusPoderoso self-requested a review July 2, 2024 09:21
@github-actions github-actions bot added the ci-pending PR which CI is running label Jul 2, 2024
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@JesusPoderoso JesusPoderoso changed the title [21226] Improve CI workflows in master, and branching model refactor (backport #365) [21226] Improve CI workflows in 2.5.x, and branching model refactor (backport #365) Jul 9, 2024
* Refs #21226: Improve CI workflows in master and apply Fast DDS branching model

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21226: Add RELEASE_SUPPORT.md file

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21226: Add suggested changes from previous / similar PRs

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21226: Apply rev suggestion

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit d912d11)
@MiguelCompany
Copy link
Member

@Mergifyio rebase

Copy link
Author

mergify bot commented Jul 18, 2024

rebase

✅ Nothing to do for rebase action

@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso July 22, 2024 06:52
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso July 22, 2024 07:06
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso July 22, 2024 09:32
@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jul 22, 2024
@JesusPoderoso JesusPoderoso merged commit 2f781a0 into 2.5.x Jul 22, 2024
3 of 4 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.5.x/pr-365 branch July 22, 2024 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants